Merge with xen-ia64-unstable.hg.
authorkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>
Sun, 20 Nov 2005 09:19:38 +0000 (10:19 +0100)
committerkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>
Sun, 20 Nov 2005 09:19:38 +0000 (10:19 +0100)

Trivial merge